auto merge of #1018 : jakub-/cargo/cargo-search-api-token, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 8 Dec 2014 21:03:01 +0000 (21:03 +0000)
committerbors <bors@rust-lang.org>
Mon, 8 Dec 2014 21:03:01 +0000 (21:03 +0000)

Trivial merge